merge emacs-23
authorKenichi Handa <handa@m17n.org>
Mon, 23 May 2011 04:35:04 +0000 (13:35 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 23 May 2011 04:35:04 +0000 (13:35 +0900)

Trivial merge